Resolved OZF-220 with updated style changes