small fixes
small fixes
refactor