made some variable names more informative, ditched some trailing whitespace