Driver section verified. Code cleaned up.

Other categories in progress.