minor refactoring
minor refactoring