clean up and more verbose output