[TIMOB-13285] Code cleanup
[TIMOB-13285] Bug fix in calling functions
Merge pull request #142 from bryan-m-hughes/timob-13285

Timob 13285