Change back unneeded list call and pep8