more cleanup of output