Refactoring applied