Cleaning up some debugging output