Tiny refactors (style)