No functional changes.  Comments and code layout.