Remove cout and fix comments