refactorings
Merge branch 'cleaner'