Correct comment error and small improvment