Minor cleanup and license change.