Cleaned up headers.