Start refactoring
Refactoring