Standardise geometry