some minor tweaks
minor refactorings
minor refactorings