more comments and whitespace removal
Fixes #7