Improved PEP8 conformity.