Refactor geometry classes