Format comments
Simplify layout and permutation keeping
Plan to avoid double loading in the future