cleaning up debug mode a bit