Some refactor of Geom.