Shorten item regex and formatting consistency