Separate download bundle and unbundle ops, pep8 cleanup