Small cleanup and prepare for tracing contracts
Small cleanup and prepare for tracing contracts

LukasWoodtli/DesignByContractPlusPlus,LukasWoodtli/DesignByContractPlusPlus,LukasWoodtli/DesignByContractPlusPlus,LukasWoodtli/DesignByContractPlusPlus