Trailing whitespace, minor coding guideline fixes, and start beefing up the