Clean-up; use rdf and rdfs vocabulary