some refactoring in the code
Merge branch 'development' of https://github.com/InformationIntegrationGroup/Web-Karma into development