Mustache code cleanup