A bit more cleaning up the flort driver.