clean up code
Merge branch 'master' of github.com:jgsmith/dhdata-site
clean up extension class a bit