whitespace and various housekeeping edits