GPII-784: Cleanup of code
GPII-784: Adressed most of antranigs comment - only one for ontologyHandler.js left