expression parser code cleanup