Refactored class in preparation for new deformation method