Tidy up a little