Use additional linters and simplify code