demove redundant comment and minor changes