v3.0.x: fix code style issues