More Python 3 Conformance. More Code Cleaning.