Refactoring object hierarchy a bit more.

I reverted the refactoring we did before for geometries.  It seems cleaner to just override the update function, rather than try to fit into the mold of create once and then update attributes.
Delete trailing whitespace