little more cleanup.