Only formatting changes, minor code cleanup.