Refactor/refactor