A couple comment changes and variable renames