tweaks
refactoring