Driver refactored - better naming, code formating.