Homogenize headers
Spacingfix