Minor fixes for pep and style