electron-126: made changes as per the PR comments
electron-126: made changes as per the PR comments

VishwasShashidhar/SymphonyElectron,KiranNiranjan/SymphonyElectron,VishwasShashidhar/SymphonyElectron,KiranNiranjan/SymphonyElectron,KiranNiranjan/SymphonyElectron,VishwasShashidhar/SymphonyElectron,VishwasShashidhar/SymphonyElectron,KiranNiranjan/SymphonyElectron