Minor refactoring ...