Refactor, cleaning, unbookmark method