cleaned up driver class a little bit