Moved pitch/roll declaration to appropriate method.