Refactor
More refactoring