Neatened some things