Removed redundant optional
Removed redundant zeroOrMore