minor refactoring of plane upgrade screns