PIM-3326: Correct code style