Removed remaining trailing whitespace
Merge branch 'feature/whitespace'