refactor eva/console