Tidy up my mess