Cleaning up markup

Take a look at the markup and the verbiage.