Updated calculations and some organization in Shape3D class