Code review, and some perf optimization.