whitespace/code cleanup.