Tidy.

Wrap some lines, rename some variables, remove some whitespace.