Fixing up the code structure of our commands