Global refactoring: init complete