refactored expression parsing