Formatted header files to be consistent