more cleanup, using classy