Cleanup, small correction to transform.