Code cleanup and RDF Literal value fix.