Code clean ups. Lots and lots of code clean ups.
Merge pull request #1 from securestate/code-cleanups

Code clean ups. Lots and lots of code clean ups.