electron-205: refactored the code as per suggestions on the PR.
electron-205: refactored the code as per suggestions on the PR.

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