Refactored variables inside instrument fieldset