Remove trailing whitespaces
Space out keyword `protected`
Add underscores to large numeric literals
Merge pull request #2785 from toch/fix-style-issues

Fix style issues