Fixed all the class names to be so much beautifuler
Completed the code cleanup