Perf profile & simplifications.
Some class simplifications.