fix trailing whitespace noted by Scrutinizer

5 trailing whitespace issues noted by Scrutinizer.

Please check @schiesbn @PVince81