Setup refactors.