Minor code cleanups. Restoring Py3
Merge pull request #136 from yakky/feature/cleanup

Minor code cleanups. Restoring Py3