Neatened some stuff up