Refactor next