Neatened everything up a bit