Cleaning up my mess