Cleaned Up Markup