Code cleanup plus contact link updates