some PEP8
merging on master