cleanup and clustering
Merge pull request #8 from annaswigart/presentation

cleanup and clustering