* Few small refactorings