removed with in mustache
more code clean up
localized mustache helpers