Adjustments based on PEP8.