Massive format refactor.