global class refactoring