More slight refactors