refactoring round model