minor adjustments
minor refactorings