Performed refactoring