Some refactoring of the code to use Following/Followers