Use pushd/popd instead of cd'ing into directories