Cleaned up code and labeled class authors