Cleaned up per Py3 idioms
Cleaned up per Py3 idioms
Default