Further cleanup of output