refactoring moveMethods
tests all green