Get rid of eval in favor of