explicit cmd addition
some more style changes