Neatened Up Code