Mini-refactors