fix comma and reorder keywords