Adding follow function and clean code