Change: Cleanup links and references
Use recent variables and make sure they are linked.
Cleanup trailing whitespace.
Merge pull request #709 from nickanderson/cleanup-stuff

Change: Cleanup links and references