Correct comment & review code