a little more cleanup and output