small refactor of api and santize service objects. thank you avdi.
Merge pull request #12 from studiostark/master

This is just a code refactor. Functionally the same.