mass refactors