Fix trailing whitespaces
Merge pull request #1578 from nulltoken/fix/whitespaces

Fix trailing whitespaces