move method refactor