refactoring expr.js