cleanup var names for readability