refactorings #2