Aesthetic Changes

Some slight aesthetic changes made. Still need to polish code