Shorten Commands and harmonize command structure

Shorten Commands and harmonize command structure+ updating command
description