Slight refactors