Code Cleanup
Merge pull request #163 from katiewood/master

Code Cleanup