refactoring successful. single global