Remove style from markup and improve format of whitespace