Suite's code refactoring.