Address review comments, move to incubator spark