Clean and tidy everything as stated in description