Refactor user following