Removed use of `eval`