removed markup from where not appropriate