Clean up API.
Merge pull request #4 from benbjohnson/api

Clean up API.