Also since this is abstracted into a function, you should go ahead and separate into airframe type too.  Then multirotors can keep Roll and Pitch at 0