Team9 refactoring