FIX: Use built-in enumerate() function

I didn't know enumerate returned an iterator in Python 2