Refactoring code
Further refactorings
Moved a method
Refactored the code