Some more formatting fixes for media classes

Based on Brian's review of https://gerrit.wikimedia.org/r/#/c/99344/

Change-Id: I35aea90da837d17bf8be5c29d22f5f0a3bcef145
Merge "Some more formatting fixes for media classes"