LBO Modelling questions (Debt Schedule)

How do you usually structure the debt schedule? I think the clearest way to go about it is to structure it as follows:

CF Available for debt service
Debt 1 (BOP, repayment, EOP, interest)
CF Available for debt service of second tranche
Debt 2 (BOP, repayment, EOP, interest)
CF after debt servicing / Change in cash
Cash (BOP, change in cash (line above), EOP, Interest)
Revolver (BOP, drawn/repaid, EOP, Interest + commitment fee on undrawn)

However, in the WSO PE course, the full LBO 1 is structured as follows:

CF Available for debt service
Cash (BOP, change in cash (line above), EOP, Interest)
Revolver (BOP, change in cash (line above), EOP, Interest)
And then the debt tranches.

Again, I think the first structure is far clearer, taking it step by step and displaying CF available for next element. However, I have come to realize that my way is flawed: when CF is negative, the revolver is drawn, but it is then not repaid until tranche 1 debt is fully repaid (i.e. Debt 1 is prioritized).

So my question is - how do you usually structure the debt schedule? Which is the easiest way (least risk for errors).

Thanks!