Cleaning up
Fixing the mess