Specify the format a bit better.
More cleanup.