Continue refactoring to method