cleaned up each class