Updated contracts
Clarify variable names
Tenders too