Minor comments improvement