Cleanup comments

Cleaned up comments and whitespace