Cleaned up some headers