Why refactoring this in this PR?