Assorted contribs

Summary:

Fix the stream creation step
Use regex for egg finding
A few style cleanups