Task us22 ingest sevice refactoring

Please, add curly braces.