staff refactors