v1.0.x: style refactor