- some refactorings