refact commands