Fix markup and spacing.