fix for getting SHELL env var
cleanup