Second round of cleanups, basically part two of the first, all the same style and whitespace/syntax changes applied.  Re-ran and included current inspections result.