class-ified geometry
rename for clarity