STYLE pep8 fixes
ENH more informative mismatch message
COSMIT: do not shadow local variable
ENH use PEP440 normalized versions