Fixed rental model and cleanup some code.