Adjusted some variable names
readability++