Refactoring stuff
Refactoring