refactor for jekyll 2