restructure some linter logic to better match st3