Some very minor refactors