suite refactoring