refactor eshell-here slightly