Fixed Python styling
Fixed merge