WP-1731: Style update