Add default title for Ashish
Cleanup topic stuff a bit
More refactoring
Get rid of codemarks class completely