Changes based on the feedback

Signed-off-by: Arpit Goyal <agmps17@gmail.com>