Finished style clean up in driver.