clean up code
change to fish