Fixes to conform to PEP8.