performance fix and code clean
Merge branch 'UIV2' of https://github.com/capensis/canopsis into UIV2