ExprLens: Refactor