Create refactor