Remove space wasting comments, detangle the two classes a bit better.
I think this is working now?  Maybe?  I hope?