Transformed output.
Minor changes and cleanup.