code style fixes
ported 2622ad122507e7f27305251856d087c1638202cd to eebedc8a218eba29efd1b9693b053501f5fdee2d (from 0.11)
coding style fixes