refactor, cleanup
Merge branch 'gh-pages'