Improve the readability of the specs

Contract and ContractRepository now are more clean and easy to
understand ;).