Refactored out staffNumber