Clean up command creation

Wohoo less code :)