requested style changes

- simplified collision check
- fix missing not