cleaning up the collision stuff a bit