Touched up all the code together