clean comments & format
Merge branch 'clean-comments'

* clean-comments:
  clean comments & format