Refact all commands