Styles and Markup Clean Up