fix(comments) - clean the code and tests
Merge remote-tracking branch 'adrian/archive-comments-fixes'