Renamed logical operator abbreviations
Refactored Grammer, also added general expression instead of beginning with orExpr