Better variable names
new variable-names and comments