Removed useless code and correct comment