Tidy things up a bit more