Style clean up
Merge branch 'gh-pages'
Style tweeks
update