Minor clean up and replace bold and italics with other markers