Improve variable namings