Addressing review comments

harshit aggarwalrequested to merge
haaggarw/AddressingMrComments into master

Addressing some left over comments from !3 (merged)

Merge request reports