Refactor for gh-pages