Review refactor