Some early-enough refactorings for readability / ease of use