I'll go back and do that for the classes that I added. I'm not sure if I should go through all 1k+ lines, considering I only touched a small portion of them.