Some pep8 improvements.
Minor changes
Final version