Tidy things up a bit..