refactorings #1