Akka rework and tidy