Address review comments from pydoop PR 9