Touched up code