PIM-3202: style clean