Refactored into using refactoring