cleaned up for class