Minor Refactorings & Cleanup
CleanCode and Refactorings (increased readability)
Extracted NonMartialArtsOptions from CharmConfiguration
Refactoring and removed Duplication