Remove useless if-block.
Comments. Fix index mistake.