Code cleanup in media module