Small tweaks to the driver to make it more readable.