refactoring : move misplaced methods to the right locations