Plane class refactored