Fix Markup and Whitespaces