Tung,

The first format you propose does seem to be more reader-friendly, and it is probably the one that I would use. Nonetheless, the second format you propose is technically correct.

Thank you for your question!

—Kyle