Chore/refactor