cleaned classes up.