Update to simplified style