Update CHANGES
Code cleanups
Check for PY2 instead of PY3