more code contracts, refactoring
Merge branch 'master' of https://github.com/MMessell/Robust-Software-Systems