- Update media collect code to match coding style and
  conventions as well as remove/rewrite comments which
  are obviosly wrong with regards to the current code