Minor layout and variable name changes.