Refactor to not follow oneself