Merge pull request #725 from jnarron/havoc

Removed some extra markup