[TIMOB-15000] Clean up code
Merge pull request #143 from vishalduggal/timob-15000

[TIMOB-15000] Clean up code