Reward refactoring