Cleaning it up
Done...maybe