Fix compile error.
Refactor.
Refactor.
Refactor.
mark methods private.
Merge branch 'master' of https://github.com/berkmancenter/mediacloud