Python style changes
merge