Removing debug, adding comments