Clean-up code
Refactoring