Minuscule refactoring