Refactoring to remove eval

Removes unnecessary (evil) evals.