chore: move functions to closer to where they are used

chore: move functions to closer to where they are used #930