moved amountFor to Rental and renamed it to getCharge
replaced thisAmount with Query (each.getCharge)

side note: in sonarScreenshot1.png you'll see how the metrics changed
from the very beginning to this point.