CON-804 | linting and adding mustache