Cleanup trailing whitespace and fixes #135