Light cleanup and new contact info.
More code cleanup.