In your first example, how you format the numbers and so forth depends on the prescribed "style" of the place where your writing appears, rather than being a case of "right" or "wrong". Your second sentence is fine. Which is best is up to you.
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.