Class descriptions & cleanup