Code cleaned up

Code cleaned up and on the final part of collisions