cleaned DatatypeFactory a bit