Clean up API.
Merge pull request #38 from meghanlarson/master

Clean up API.