small whitespace edits and cleanup