cleaned up for first class