code cleanup
Clean up some typos and derpings in stream
cleaning up main class a bit