Made brace placement consistant

Also removed the ship to ship collision code that was commented out.