Merge pull request #190 from katiewood/master

code cleanup