cleaned up driver a bit