Improve collision, clear code