more clean up. fewer classes