Remove trailing comma
Order options in same way