comment bookmark refactor