Cleaning up debug to debug better