Normalized markup and spacing, no org changes