Add rag match and reformat code

Add rag match and reformat code #435