Cleaned up classes and lessons code.