minor
minor refactoring