refactor methods, place methods in correct locations