Clean up the commands a bit