Shifted some methods around to declutter source files