Globall refactoring