Issue 1522: style formatting