Minor cleanup and re-added copyright notice.