Collision detection
Code preformatting

Source code has been properly formatted, not documented yet