Big Refactor

DIAMETER/2 = RADIUS
Made collision conditionals more readable/semantic