Some refactorings has been made
Cleaning code
Collision detection updated