Cleaned up formatting of header generation code.