Cleaning up some Reek UncommunicativeVariableName warnings