fix lots of linter issues
[skip ci] shippable build 34.1