Remove trailing spaces. Style cleanup.