Refactor: simplified collision, misc