please use comma-last style throughout this diff, as well as 4-space indentation.