Remove trailing lines in file.
Keep a blank line before and after keyword protected.
Add a space after comma.
Add spaces around + and - operators.
Merge pull request #623 from toch/fix-style-issues

Fix style issues