- cleaning up some of the code
- rewriting the service store some what;
Merge pull request #5 from gambol99/develop

- cleaning up some of the code