pep8 and some settings improvements