Merge pull request #2061 from DimitriPapadopoulos/trailing_spaces

Fix a couple trailing spaces