Fixing link, more cleanup