cleaned up concrete classes