Cleaned up header per CTR-126.