Removes a bunch of totally unnecessary new lines
Changes some variables to constants in util spec as they should be.