Tidy up (a tad sloppy)