a little more cleanup