do some cleanup work for #1
remove ugly comments. fixes #1
this change closes #1