Refactor environments and benchmarks.