style cleanup and support bold and underline