Merge pull request #168 from katiewood/master

cleanup code