design and cleanup
Merge pull request #7 from amsterdamhackathon/henry

design and cleanup