Log refactored to use streams and do not store consumed events
Minor cleanup