Better organization in Main, TagGrammarFinder commenting