Better contract extraction.

We keep indentation of the contract.