VP-317: linting