pep8  and suggestions fixes