#: Code refactor
#: Fish solution