Attempt at cleaning up the code a bit and hardening where it makes sense#21

protitude merged 9 commits into

1.2.xUCBoulder/oit:1.2.xfrom

code-hardeningUCBoulder/oit:code-hardeningCopy head branch name to clipboard