refactor isFollowing and minimal changes