Refactor Commands Again

Only some shorter text paketes ^^