Linking, commenting, cleanup