Global refactor.