Code review changes.

Signed-off-by: MythiliM <mythilim@MythiliMLaptop.redmond.corp.microsoft.com>