some cleanup on the formatting and fix a character issue that mac seemed to create...freaking apple, again