Change: Cleanup links and references Use recent variables and make sure they

are linked. Cleanup trailing whitespace.