wip: simple refactorings made