Made eval statement easier to read