minors
refactoring