made collision() more concise
minor change
minor changes