cleaned up for next class