Markup Clean Up