minor
refactoring