Cleaned up command definitions