Slight cleanup with headers.