comment/whitespace cleanups