cleaned up userclass