More pep8 fixes
Updated to use enumerate