Method refactor