Removing debug, improving comments