Created by: abhinavarora

Fixing some code review comments left by @NorthStar and @pengli09 in https://github.com/PaddlePaddle/Paddle/pull/4479