Remove trailing whitespace
Fix grouping