Cleaned up blueprint regexes