Pull out Method refactor