refactor(complete): Move related functions next to each other