Comments, formatting, and a some code style conformance tweaks