rents refactor