cleaning up mustache issue