Improve output of cleanup