Refactor instrument value controls