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

So, so much better!
Now that I'm seeing it, I don't know anymore. I'll let you decide and that will be that.