refactorings after discussions with Peaker