Refactoring for PR