Refactored collision code. Saved a couple of lines.