Neatened things up a bit