Code cleanup, additions, following refactoring BookmarkModel