Fix headers, remove extra spaces.