Cleaned up the way parsing is done to filter with better regexes