Additional work refactoring