WP-578: made style changes based on spec.