White header and did some clean-up