Moved size calcs to Geometry methods