Global refactoring
Global refactoring