Neatened things up a little