Cosmetic refactors from review