Refactored character classes