rename command line options to fit CGAT style
pep8 changes