Refactoring done by PR