Unused
Remove duplication
Use same pattern for client configuration
Remove duplication
Cosmetics
Remove duplication
Better error messages
Remove duplication
Rename