Fix: Avoid magic string literals
Merge pull request #274 from localheinz/fix/avoid-magic-strings

Fix: Avoid magic string literals