cleaning up debug and comments