marginal refactoring + lidt raport