Rework Header Definition, Spacing, Misc