Tiny refactors