[fzf] refactor fish code a bit more