Removed unused staff for values in brackets

  - Small refactoring