Adapted OWL classes and properties; also, made code clearer and safer