shuffeling command structures arround for closer psr-2 compliance