create fish refactored