gh-pages: refactoring