Making things more aligned with PEP8.