Normalize service names
Reformat files