Fix keyword in batch
Refactor services
Refactor service
Refactor services