Fixes #1158

Addresses the friend note issue in #1158. I also noticed that there was a lot of trailing whitespace in the file and I configured my editor to remove it on-save anyways, so I made that change in separate commit. If you guys think it would be useful to do this on every file in the repository, I could remove all of the whitespace en masse.