Lint refactor

[ci skip]