Worked on cleaning up clidriver.py