Refactor expr parsing
Fix some debris