Correctly tracks club collision point (Jay), bits of code cleaning