Refactoring changes for Simple Risk