Modify comments and useless code