Pep8 conventions fixed