Moved follow/unfollow logging to better place