minor refactorings
fix