Global refactors