Refactorization to simplify storage of transient data