made geometry struct declarations consistent with other struct declarations