Applyed refactoring