replace with better code
consistent setting with gh-pages
use better code