Minor refactoring and character set cleanup

[StefanSpieker]

Minor refactoring:

• use switch instead of if-else
• use StandardCharsets instead of strings
• use diamond operator
• and removed obsolete semicolons and imports

Testing done

Ran all unit tests and played with it in a debug environment

Submitter checklist

Preview Give feedback

1. Make sure you are opening from a topic/feature/bugfix branch (right side) and not your main branch!
2. Ensure that the pull request title represents the desired changelog entry
3. Please describe what you did
4. Link to relevant issues in GitHub or Jira
5. Link to relevant pull requests, esp. upstream and downstream changes
6. Ensure you have provided tests - that demonstrates feature works or fixes the issue

[MarkEWaite]

Thanks! Improvement looks good to me