refactor to remove eval, comments