Refactor
More refactoring
Refactoring