Refactor Plane class