[TIMOB-14281] Code Refactor
Merge pull request #139 from vishalduggal/timob-14281

[TIMOB-14281] Code Refactor