Tidied up Mustache parser