Global refactoring #2