minor refactoring, cosmetic
merge