minor changes
refactor