minor Insight code cleanup

preparatory to other changes for UI testing work
Merge pull request #1405 from mtbc/rebased/develop/insight-tidyup

minor Insight code cleanup (rebased onto develop)