WIP
Small refactorings