A couple of formatting changes and variable name changes.