Merge pull request #164 from katiewood/master

code cleanup
Merge pull request #165 from katiewood/master

code cleanup