Refactored air ops editing