committing clean up changes to main driver