Refactor geovalues

(closes #41)