final clean up
Merge pull request #9 from annaswigart/final

final clean up