Cleaned up driver.rs

I did a little bit of cleanup work in driver.rs. It's not much but hey little steps.