Contracts Cleanup#25

sean-parent wants to merge 15 commits intomainstlab/better-code:mainfrom

sean-parent/contracts-cleanupstlab/better-code:sean-parent/contracts-cleanupCopy head branch name to clipboard