minor refactoring
cosmetics