Tidy up a little more