refactorings
fixes