slightly sounder regexps
fixed format