Refactors to use Mustache style templating