Refactored Code #4253

Review ID: 3253001
Merge pull request #171 from aroraumang/feature/task-4253

Refactored Code #4253