Overhaul linter for better messaging
Tweak linter for better better messaging