Renamed view variable
Split out expression parsing