little more cleanup...