Solved some pep8 warnings