Improvements:

Signed-off-by: Paras Sood <psood@deloitte.com>