Chore/refactorings