Stylecop fix

Fix StyleCop warnings
Remove the trailing spaces.