Cleaning up debug printfs