Code improvements w.r.t. naming of variables.