Fix comment

No longer uses stream for file content
Rename regexes

To indicate that they should be private.