Refactoring mark_as_read!