WIP: Reduce complexity [Shell]