fix trailing whitepace
Merge pull request #4601 from jbclements/cleanup-and-test-cases

fix trailing whitepace