Merge pull request #166 from katiewood/master

code cleanup