some clean up
added new class