Simpify code by removing 'eval'.