refactoring - move method to a new class