Refactoring, moving methods.