small refactoring
fixes