Neatened everything up.