Changes to align with Google Python style guidelines