Imporve consistency with pep8 standard, in particular for doc strings