CSS Markup Cleanup