minor code cleanup
whitespace/doc cleanup