Merge pull request #169 from katiewood/master

code cleanup