Cleaning up
Cleaning up and refactoring