Some code cleanup and changing corpus.jade changes to jade markup from raw html.