Fix according to PEP.
Fix PEP warnings.
merge