Clean up wording and conditional for Python 3