Refactor/pr1