more refactorings #71