Update formatting and separate patterns