Clean up code (should be no functional changes)
Fix broken link