More refactoring towards single pass and akka