Global refactor 2