Cleaned up more markup
Merge pull request #192 from pjackson28/cleanupmarkup

Cleaned up more markup