cleaned up collision code some