restructured fish functions

Created by  Calcifer  on March 12, 2016
W4LYV3BYQIVK56MOQTNXO6RU47KUEOUCQIZ6PU23MJZ6WNFUS3IQC
Change contents