Polish IngestManager code changes