Global refactoring was done