code style/whitespace consistency; remove empty comment blocks
code style/whitespace consistency
remove old/dead code, cleanup after initial revisions