diff --git a/ontology/saref4city.ttl b/ontology/saref4city.ttl
index 609139ad0b6630b71c596df53f73f6d45e17e750..e24d66bcd88f23002481f1edbd8a6d59ec982bbd 100644
--- a/ontology/saref4city.ttl
+++ b/ontology/saref4city.ttl
@@ -63,30 +63,6 @@ vann:preferredNamespacePrefix a owl:AnnotationProperty .
 
 vann:preferredNamespaceUri a owl:AnnotationProperty .
 # 
-# http://www.w3.org/2003/01/geo/wgs84_pos#alt
-
-geo:alt a rdf:Property ;
-	rdfs:comment "The WGS84 altitude of a SpatialThing (decimal meters above the local reference ellipsoid)." ;
-	rdfs:label "altitude" ;
-	rdfs:domain geo:SpatialThing .
-# 
-# http://www.w3.org/2003/01/geo/wgs84_pos#lat
-
-geo:lat a rdf:Property ;
-	rdfs:comment "The WGS84 latitude of a SpatialThing (decimal degrees)." ;
-	rdfs:label "latitude" ;
-	rdfs:domain geo:SpatialThing .
-# 
-# http://www.w3.org/2003/01/geo/wgs84_pos#location
-
-geo:location a rdf:Property .
-# 
-# http://www.w3.org/2003/01/geo/wgs84_pos#long
-
-geo:long a rdf:Property ;
-	rdfs:comment "The WGS84 longitude of a SpatialThing (decimal degrees)." ;
-	rdfs:label "longitude" ;
-	rdfs:domain geo:SpatialThing .
 # 
 # 
 # 
@@ -140,10 +116,6 @@ geosp:sfWithin a owl:ObjectProperty ;
 	rdfs:isDefinedBy <http://www.opengis.net/ont/geosparql> ;
 	rdfs:label "within"@en .
 # 
-# http://www.w3.org/2003/01/geo/wgs84_pos#location
-
-geo:location a owl:ObjectProperty .
-# 
 # https://saref.etsi.org/saref4city/assesses
 
 s4city:assesses a owl:ObjectProperty ;
@@ -299,6 +271,15 @@ saref:relatesToMeasurement a owl:ObjectProperty ;
 saref:relatesToProperty a owl:ObjectProperty ;
 	rdfs:isDefinedBy <https://saref.etsi.org/core/> ;
 	rdfs:label "relates to property"@en .
+
+
+# http://www.w3.org/2003/01/geo/wgs84_pos#location
+
+geo:location a owl:ObjectProperty ;
+    rdfs:comment "The relation between something and the point, or other geometrical thing in space, where it is.  For example, the realtionship between a radio tower and a Point with a given lat and long. Or a relationship between a park and its outline as a closed arc of points, or a road and its location as a arc (a sequence of points). Clearly in practice there will be limit to the accuracy of any such statement, but one would expect an accuracy appropriate for the size of the object and uses such as mapping ." ;
+	rdfs:label "location" .
+# 
+
 # 
 # 
 # 
@@ -350,6 +331,26 @@ saref:hasTimestamp a owl:DatatypeProperty ;
 saref:hasValue a owl:DatatypeProperty ;
 	rdfs:isDefinedBy <https://saref.etsi.org/core/> ;
 	rdfs:label "has value"@en .
+# http://www.w3.org/2003/01/geo/wgs84_pos#alt
+
+geo:alt a owl:DatatypeProperty ;
+	rdfs:comment "The WGS84 altitude of a SpatialThing (decimal meters above the local reference ellipsoid)." ;
+	rdfs:label "altitude" ;
+	rdfs:domain geo:SpatialThing .
+# 
+# http://www.w3.org/2003/01/geo/wgs84_pos#lat
+
+geo:lat a owl:DatatypeProperty ;
+	rdfs:comment "The WGS84 latitude of a SpatialThing (decimal degrees)." ;
+	rdfs:label "latitude" ;
+	rdfs:domain geo:SpatialThing .
+# 
+# http://www.w3.org/2003/01/geo/wgs84_pos#long
+
+geo:long a owl:DatatypeProperty ;
+	rdfs:comment "The WGS84 longitude of a SpatialThing (decimal degrees)." ;
+	rdfs:label "longitude" ;
+	rdfs:domain geo:SpatialThing .
 # 
 # 
 # 
@@ -793,24 +794,3 @@ saref:UnitOfMeasure a owl:Class ;
 	rdfs:comment "The unit of measure is a standard for measurement of a quantity, such as a Property. For example,  Power is a property and Watt is a unit of power that represents a definite predetermined power: when we say 10 Watt, we actually mean 10 times the definite predetermined power called \"watt\". Our definition is based on the definition of unit of measure in the Ontology of units of Measure (OM). We propose here a list of some units of measure that are relevant for the purpose of the Smart Appliances ontology, but this list can be extended."@en ;
 	rdfs:isDefinedBy <https://saref.etsi.org/core/> ;
 	rdfs:label "Unit of measure"@en .
-# 
-# 
-# 
-# #################################################################
-# #
-# #    Annotations
-# #
-# #################################################################
-# 
-# 
-
-geo:location rdfs:comment """The relation between something and the point, 
- or other geometrical thing in space, where it is.  For example, the realtionship between
- a radio tower and a Point with a given lat and long.
- Or a relationship between a park and its outline as a closed arc of points, or a road and
- its location as a arc (a sequence of points).
- Clearly in practice there will be limit to the accuracy of any such statement, but one would expect
- an accuracy appropriate for the size of the object and uses such as mapping .
- """ ;
-	rdfs:label "location"@en .
-