v2.0.x: fix code style issues