little more cleanup