code cleanup
Merge pull request #164 from katiewood/master

code cleanup