Stop using single letter for variable names and remove "to the caller"