Clean up API
Merge pull request #19 from rhonsby/la/refactor-backend

looks good