Code cleanup and Link integration