Use built-in fish function for better reading
Merge pull request #4 from mojoLyon/refactoring-completion

Use built-in fish function for better reading