Cleaned up init code, added benchmarks to other init calls.