Minor refactoring
Broaden the range of valid identifiers