Work standardizing headers, making headers case insensitive, and code cleanup