Collision detection is better. Code cleanup in Object