minor refactoring

no functional changes