commit 25_06 09:09
refactorings only