minor adjusts
refactoring