Tidy up mess