#484 some refactorings