clean up new impl with rent division