more whitespace and some commenting cleanup