Same question as above. Should I create a separate refactoring PR?