Neatened some code