Made more pep8