Fixes based on PEP8.