Tiny refactoring of utility classes