Fixed to work after a spyder reset + pep8 fixes