global refactoring
global refactoring