Simplify header.
Small adjustments.