some fix for contract model and clean code
some trad for contract model
some fix for contract model
some fix for contract model
Merge pull request #1197 from grandoc/develop

some fix for contract model and clean code