Lint classes better (much better) --- Fixes gh-1940

So, so much better!
I have no idea where this came from! I didn't do this! hmm...