Merge pull request #162 from katiewood/master

code cleanup