Don't needlessly use static in Media inner class
Tidy imports