code cleanup
Merge pull request #185 from katiewood/master

code cleanup