toString cleanup
switch/case in place of if/else and a typo
Removed unused ClientRegistrationException