Conversion of operators to identifiers for specified element content fixes #20
Minor refactoring