Cleaning up for readability.
Completed refactor and added streamer.