Cleaning up markup

@rcubarocha  Take a look at the markup and the verbiage.