cleans up Python driver code as per review
Merge branch 'ql-refactor' into sam_ql_refactor