Normalize service names
Reformat files
Merge pull request #2 from jccomputing/master

Small improvements