Clean up comments
Refactoring and remove `fill-width` class
Merge branch 'master' into gh-pages

* master:
  Refactoring and remove `fill-width` class
  Clean up comments