Refactored
More refactoring