Cleaning up debugging output somewhat