Tidy up things a bit