Extract methods refactoring