Minor cleanup and comments.
Minor changes to the transform.