Made the refactoring