DRYing code up

Introduced a `constant` for the geometry field and added a test to catch
the value being changed from the expected value `geometry`. Shuffled a
few lines of code to ensure certain methods were only referenced once
and all logic flow passed through the same path.