Epic/refactor