comment and assert cleanup