Rent logik refactored