minor cleaning up of markup