Refactoring 06 extracting frequent renter points - and clearing code