Some cleanup + add fish syntax hightlighting