Make more consistent with PEP8