Refactoring
Refactoring
More refactoring