[FLINK-1170] address pull request review comments