minor changes
refactoring
refactoring