Import cleanup and minor formatting changes only.