redundant code commented and comments refinement