refactorings
WIP