Refactoring
More refactoring
Refactoring